From e697c1c3c3ff772721ec5a6161c30aa8b114d5ac Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Fri, 16 Jan 2004 14:41:53 +0000
Subject: [PATCH] Implement callback in libjeeps for waypoint output, use that
 for status in garmin.c

---
 gpsbabel/garmin.c       | 18 +++++++++++++-----
 gpsbabel/jeeps/gpsapp.c | 10 +++++++---
 gpsbabel/jeeps/gpsapp.h |  2 +-
 gpsbabel/jeeps/gpscom.c |  4 ++--
 gpsbabel/jeeps/gpscom.h |  2 +-
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index 51d3beb1f..f1f4bf690 100644
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -304,6 +304,17 @@ sane_GPS_Way_New(void)
 
 	return way;
 }
+static int 
+waypt_write_cb(GPS_PWay *way)
+{
+	static int i;
+
+	if (global_opts.verbose_status) {
+		fprintf(stdout, "%d\r", ++i*100/waypt_count());
+		fflush(stdout);
+	}
+	return 0;
+}
 
 static void
 waypoint_write(void)
@@ -350,13 +361,9 @@ waypoint_write(void)
 		if (wpt->altitude != unknown_alt) {
 			way[i]->alt = wpt->altitude;
 		}
-		if (global_opts.verbose_status) {
-			fprintf(stdout, "%d\r", i*100/n);
-			fflush(stdout);
-		}
 		i++;
 	}
-	if ((ret = GPS_Command_Send_Waypoint(portname, way, n)) < 0) {
+	if ((ret = GPS_Command_Send_Waypoint(portname, way, n, waypt_write_cb)) < 0) {
 		fatal(MYNAME ":communication error sending wayoints..\n");
 	}
 
@@ -365,6 +372,7 @@ waypoint_write(void)
 	}
 	if (global_opts.verbose_status) {
 		fprintf(stdout, "\r\n");
+		fflush(stdout);
 	}
 	xfree(way);
 }
diff --git a/gpsbabel/jeeps/gpsapp.c b/gpsbabel/jeeps/gpsapp.c
index 6fff83157..f75b767de 100644
--- a/gpsbabel/jeeps/gpsapp.c
+++ b/gpsbabel/jeeps/gpsapp.c
@@ -27,7 +27,6 @@
 #include <time.h>
 #include <stdlib.h>
 
-
 static int32    GPS_A000(const char *port);
 static void   GPS_A001(GPS_PPacket packet);
 
@@ -695,7 +694,7 @@ int32 GPS_A100_Get(const char *port, GPS_PWay **way)
 **
 ** @return [int32] success
 ************************************************************************/
-int32 GPS_A100_Send(const char *port, GPS_PWay *way, int32 n)
+int32 GPS_A100_Send(const char *port, GPS_PWay *way, int32 n, int (*cb)())
 {
     UC data[GPS_ARB_LEN];
     int32 fd;
@@ -724,6 +723,11 @@ int32 GPS_A100_Send(const char *port, GPS_PWay *way, int32 n)
 
     for(i=0;i<n;++i)
     {
+        if (cb) {
+		if (cb(way[i]))
+			break;
+	}
+
 	switch(gps_waypt_type)
 	{
 	case pD100:
@@ -788,7 +792,7 @@ int32 GPS_A100_Send(const char *port, GPS_PWay *way, int32 n)
 	    return gps_errno;
 	}
     }
-    
+
     GPS_Util_Put_Short(data,COMMAND_ID[gps_device_command].Cmnd_Transfer_Wpt);
     GPS_Make_Packet(&tra, LINK_ID[gps_link_type].Pid_Xfer_Cmplt,
 		    data,2);
diff --git a/gpsbabel/jeeps/gpsapp.h b/gpsbabel/jeeps/gpsapp.h
index 118895303..5f27450a3 100644
--- a/gpsbabel/jeeps/gpsapp.h
+++ b/gpsbabel/jeeps/gpsapp.h
@@ -12,7 +12,7 @@ extern "C"
 int32  GPS_Init(const char *port);
 
 int32  GPS_A100_Get(const char *port, GPS_PWay **way);
-int32  GPS_A100_Send(const char *port, GPS_PWay *way, int32 n);
+int32  GPS_A100_Send(const char *port, GPS_PWay *way, int32 n, int (*cb)(GPS_PWay *));
 
 int32  GPS_A200_Get(const char *port, GPS_PWay **way);
 int32  GPS_A201_Get(const char *port, GPS_PWay **way);
diff --git a/gpsbabel/jeeps/gpscom.c b/gpsbabel/jeeps/gpscom.c
index d1d07d704..7ac611aea 100644
--- a/gpsbabel/jeeps/gpscom.c
+++ b/gpsbabel/jeeps/gpscom.c
@@ -109,14 +109,14 @@ int32 GPS_Command_Get_Waypoint(const char *port, GPS_PWay **way)
 ** @return [int32] success
 ************************************************************************/
 
-int32 GPS_Command_Send_Waypoint(const char *port, GPS_PWay *way, int32 n)
+int32 GPS_Command_Send_Waypoint(const char *port, GPS_PWay *way, int32 n, int (*cb)())
 {
     int32 ret=0;
 
     switch(gps_waypt_transfer)
     {
     case pA100:
-	ret = GPS_A100_Send(port, way, n);
+	ret = GPS_A100_Send(port, way, n, cb);
 	break;
     default:
 	GPS_Error("Send_Waypoint: Unknown waypoint protocol");
diff --git a/gpsbabel/jeeps/gpscom.h b/gpsbabel/jeeps/gpscom.h
index ba1c36f09..90c0cba52 100644
--- a/gpsbabel/jeeps/gpscom.h
+++ b/gpsbabel/jeeps/gpscom.h
@@ -29,7 +29,7 @@ int32  GPS_Command_Get_Track(const char *port, GPS_PTrack **trk);
 int32  GPS_Command_Send_Track(const char *port, GPS_PTrack *trk, int32 n);
 
 int32  GPS_Command_Get_Waypoint(const char *port, GPS_PWay **way);
-int32  GPS_Command_Send_Waypoint(const char *port, GPS_PWay *way, int32 n);
+int32  GPS_Command_Send_Waypoint(const char *port, GPS_PWay *way, int32 n, int (*cb)());
 
 int32  GPS_Command_Get_Proximity(const char *port, GPS_PWay **way);
 int32  GPS_Command_Send_Proximity(const char *port, GPS_PWay *way, int32 n);
-- 
2.30.2